bitkeeper revision 1.146 (3e761a8bG8D0sHIrqHKpkx1hSuhB1A)

tg3.c:
  Fix for new tg3 driver.

diff --git a/xen/drivers/net/tg3.c b/xen/drivers/net/tg3.c
index 144d89ceb98f0b154a752d5cd26a1f8ebc677ead..cb1d1e512b82fb1607bc7af9592ff9b75b309ff1 100644 (file)
--- a/xen/drivers/net/tg3.c
+++ b/xen/drivers/net/tg3.c
@@ -2075,10 +2075,11 @@ static int tg3_poll(struct net_device *netdev, int *budget)
 {
        struct tg3 *tp = netdev->priv;
        struct tg3_hw_status *sblk = tp->hw_status;
-       unsigned long flags;
        int done;
-
+#ifdef NAPI
+       unsigned long flags;
        spin_lock_irqsave(&tp->lock, flags);
+#endif
 
        /* handle link change and other phy events */
        if (!(tp->tg3_flags &
@@ -2098,7 +2099,9 @@ static int tg3_poll(struct net_device *netdev, int *budget)
                spin_unlock(&tp->tx_lock);
        }
 
+#ifdef NAPI
        spin_unlock_irqrestore(&tp->lock, flags);
+#endif
 
        /* run RX thread, within the bounds set by NAPI.
         * All RX "locking" is done by ensuring outside